From 862007fe1c33948d78e1abf208d94d54490eee5c Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 10 Nov 2015 13:48:31 +0000 Subject: [PATCH] Move GtkListBox g_autoptr macros to the class header This allows GtkPlacesViewRow to use G_DECLARE_FINAL_TYPE without having to include gtk.h. --- gtk/gtk-autocleanups.h | 2 -- gtk/gtklistbox.h | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gtk/gtk-autocleanups.h b/gtk/gtk-autocleanups.h index 4a9e621746..60cccdd943 100644 --- a/gtk/gtk-autocleanups.h +++ b/gtk/gtk-autocleanups.h @@ -116,8 +116,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkLabel, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkLayout, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkLevelBar, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkLinkButton, g_object_unref) -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkListBox, g_object_unref) -G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkListBoxRow, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkListStore, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkLockButton, g_object_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkMenu, g_object_unref) diff --git a/gtk/gtklistbox.h b/gtk/gtklistbox.h index 71200875c5..61c00d88ec 100644 --- a/gtk/gtklistbox.h +++ b/gtk/gtklistbox.h @@ -313,6 +313,11 @@ void gtk_list_box_bind_model (GtkListBox gpointer user_data, GDestroyNotify user_data_free_func); +#ifndef __GI_SCANNER__ +G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkListBox, g_object_unref) +G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkListBoxRow, g_object_unref) +#endif + G_END_DECLS #endif -- 2.30.2